bitkeeper revision 1.1537 (42939e4ewE9MEwuinOdZNB74jNWI-w)

[PATCH] vmx-debug.patch

Allow control of vmx debug log level from the command line.

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff --git a/.rootkeys b/.rootkeys
index 141b21cf73de063abba019768ec0d4eea3d26f90..1891b6afe9147bf94b337f40a14d8012425a3315 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -1420,7 +1420,6 @@
 3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/public/xen.h
 3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h
 40715b2epYl2jBbxzz9CI2rgIca7Zg xen/include/xen/acpi.h
-422f0995xCgnbsVhTjSncnqIABs64g xen/include/xen/adv_sched_hist.h
 427fa2d1wyoVbvCyZRLposYjA_D_4g xen/include/xen/bitmap.h
 427fa2d1ItcC_yWuBUkhc7adedP5ow xen/include/xen/bitops.h
 3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h

diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c
index c98913f57810b5d46b8e592b6f7cc50437ae6f86..80c778a2deeb2fd771eeab5363499e90ec151c1b 100644 (file)
--- a/xen/arch/x86/vmx.c
+++ b/xen/arch/x86/vmx.c
@@ -43,6 +43,7 @@
 
 int vmcs_size;
 unsigned int opt_vmx_debug_level = 0;
+integer_param("vmx_debug", opt_vmx_debug_level);
 
 extern long evtchn_send(int lport);
 extern long do_block(void);

diff --git a/xen/include/xen/adv_sched_hist.h b/xen/include/xen/adv_sched_hist.h
deleted file mode 100644 (file)
index d8d5627..0000000
--- a/xen/include/xen/adv_sched_hist.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Some functions to suport advanced scheduler histograms
-   Author: Stephan.Diestelhorst@cl.cam.ac.uk */
-//#include <xen/sched.h>
-//#include <xen/sched-if.h>
-#include <asm/msr.h>
-#define ADV_SCHED_HISTO
-static inline void adv_sched_hist_start(int cpu) {
-       u64 now;
-       rdtscll(now);
-       if (!schedule_data[cpu].save_tsc)
-               schedule_data[cpu].save_tsc = now;
-}
-static inline void adv_sched_hist_from_stop(int cpu) {
-       u64 now;
-       rdtscll(now);
-       if (schedule_data[cpu].save_tsc) {
-               now -= schedule_data[cpu].save_tsc;
-               now /= 7;
-               if (now < BUCKETS-1)
-                       schedule_data[cpu].from_hist[now]++;
-               else
-                       schedule_data[cpu].from_hist[BUCKETS-1]++;
-
-               schedule_data[cpu].save_tsc = 0;
-       }
-}
-static inline void adv_sched_hist_to_stop(int cpu) {
-       u64 now;
-       rdtscll(now);
-       if (schedule_data[cpu].save_tsc) {
-               now -= schedule_data[cpu].save_tsc;
-               now /= 24;
-               if (now < BUCKETS-1)
-                       schedule_data[cpu].to_hist[now]++;
-               else
-                       schedule_data[cpu].to_hist[BUCKETS-1]++;
-
-               schedule_data[cpu].save_tsc = 0;
-       }
-}